Changed GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID for GTK_CELL_AREA_WARN_INVALID_C...

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 589641bb91205ac9644ba2bc14507a152751eaca..8104875f3dc73d1a9af2cd4a9d1a4c474ea069b8 100644 (file)
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -4386,6 +4386,7 @@ gtk_cell_layout_get_type
 GtkCellArea
 GtkCellAreaClass
 GtkCellCallback
+GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID
 gtk_cell_area_add
 gtk_cell_area_remove
 gtk_cell_area_has_renderer
@@ -4415,7 +4416,6 @@ gtk_cell_area_cell_set_valist
 gtk_cell_area_cell_get_valist
 gtk_cell_area_cell_set_property
 gtk_cell_area_cell_get_property
-GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID
 gtk_cell_area_is_activatable
 gtk_cell_area_activate
 gtk_cell_area_focus

diff --git a/gtk/gtkcellarea.h b/gtk/gtkcellarea.h
index 874a863c2b39b243b4727926e881cb608a0e9b0f..cf396c638ae76b2baf53206f9e2057fd368beddc 100644 (file)
--- a/gtk/gtkcellarea.h
+++ b/gtk/gtkcellarea.h
@@ -46,6 +46,19 @@ typedef struct _GtkCellAreaClass         GtkCellAreaClass;
 typedef struct _GtkCellAreaPrivate       GtkCellAreaPrivate;
 typedef struct _GtkCellAreaContext       GtkCellAreaContext;
 
+/**
+ * GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID:
+ * @object: the #GObject on which set_cell_property() or get_get_property()
+ *  was called
+ * @property_id: the numeric id of the property
+ * @pspec: the #GParamSpec of the property
+ *
+ * This macro should be used to emit a standard warning about unexpected
+ * properties in set_cell_property() and get_cell_property() implementations.
+ */
+#define GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID(object, property_id, pspec) \
+  G_OBJECT_WARN_INVALID_PSPEC ((object), "cell property id", (property_id), (pspec))
+
 /**
  * GtkCellCallback:
  * @renderer: the cell renderer to operate on
@@ -341,10 +354,6 @@ void                  gtk_cell_area_cell_get_property              (GtkCellArea
                                                                    const gchar        *property_name,
                                                                    GValue             *value);
 
-#define GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID(object, property_id, pspec) \
-  G_OBJECT_WARN_INVALID_PSPEC ((object), "cell property id", (property_id), (pspec))
-
-
 /* Focus */
 gboolean              gtk_cell_area_is_activatable                 (GtkCellArea         *area);
 gboolean              gtk_cell_area_activate                       (GtkCellArea         *area,

diff --git a/gtk/gtkcellareabox.c b/gtk/gtkcellareabox.c
index d51e11ac6568df02c5485c4bb89e8a6c62aa5ac9..e24119a75a10886f6fc64235cf3b1a20c7aadfb3 100644 (file)
--- a/gtk/gtkcellareabox.c
+++ b/gtk/gtkcellareabox.c
@@ -1401,7 +1401,7 @@ gtk_cell_area_box_set_cell_property (GtkCellArea        *area,
        }
       break;
     default:
-      GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID (area, prop_id, pspec);
+      GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID (area, prop_id, pspec);
       break;
     }
 
@@ -1443,7 +1443,7 @@ gtk_cell_area_box_get_cell_property (GtkCellArea        *area,
       g_value_set_enum (value, info->pack);
       break;
     default:
-      GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID (area, prop_id, pspec);
+      GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID (area, prop_id, pspec);
       break;
     }
 }